tegra: pad rootfs to recreate overlay after upgrade
authorTomasz Maciej Nowak <tmn505@gmail.com>
Wed, 15 May 2024 17:02:06 +0000 (19:02 +0200)
committerHauke Mehrtens <hauke@hauke-m.de>
Fri, 17 May 2024 14:04:24 +0000 (17:04 +0300)
The old overlay remained after upgrades and would cause failure on first
boot after upgrade, in which no new overlay could be created while old
one was unusable.

Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
target/linux/tegra/image/Makefile

index 82394f4ab6fadb367dc7fd9a500dac0bb8084f4c..8a331f2607538edbb901cf3bc6b2f08ff1075efd 100644 (file)
@@ -16,12 +16,13 @@ define Build/tegra-sdcard
                -n '$(DEVICE_TITLE) OpenWrt bootscript' \
                -d $(BOOT_SCRIPT) \
                $@.boot/boot.scr
+       $(CP) $@ $@.rootfs
 
        SIGNATURE="$(IMG_PART_SIGNATURE)" \
        $(SCRIPT_DIR)/gen_image_generic.sh \
                $@ \
                $(CONFIG_TARGET_KERNEL_PARTSIZE) $@.boot \
-               $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(IMAGE_ROOTFS) \
+               $(CONFIG_TARGET_ROOTFS_PARTSIZE) $@.rootfs \
                2048
 
        $(if $(UBOOT),dd if=$(STAGING_DIR_IMAGE)/$(UBOOT).img of=$@ bs=512 skip=1 seek=1 conv=notrunc)
@@ -32,7 +33,7 @@ DEVICE_VARS += BOOT_SCRIPT UBOOT
 define Device/Default
   BOOT_SCRIPT := generic-bootscript
   IMAGES := sdcard.img.gz
-  IMAGE/sdcard.img.gz := tegra-sdcard | gzip | append-metadata
+  IMAGE/sdcard.img.gz := append-rootfs | pad-extra 128k | tegra-sdcard | gzip | append-metadata
   KERNEL_NAME := zImage
   KERNEL := kernel-bin
   PROFILES := Default